diff --git a/client/camera.go b/client/camera.go
index 2584cbe..a51c802 100644
--- a/client/camera.go
+++ b/client/camera.go
@@ -121,7 +121,9 @@ func (cs *CameraStore) Reduce(state, a interface{}) interface{} {
 		cstate.H = float64(act.WindowResizing.Height)
 	case action.GoHome:
 		cp := cs.Store.Players.FindCurrent()
-		cstate.X, cstate.Y = cs.Store.Map.GetHomeCoordinates(cp.LineID)
+		x, y := cs.Store.Map.GetHomeCoordinates(cp.LineID)
+		x -= (cstate.W / 2) - ((18 * 16) / 2)
+		cstate.X, cstate.Y = x, y
 	}
 
 	return cstate
diff --git a/client/map.go b/client/map.go
index 36c9683..251206c 100644
--- a/client/map.go
+++ b/client/map.go
@@ -35,4 +35,31 @@ func (m *Map) Draw(screen *ebiten.Image) {
 	inverseZoom := maxZoom - s.Zoom + zoomScale
 	mi := ebiten.NewImageFromImage(m.game.Store.Map.GetState().(store.MapState).Image)
 	screen.DrawImage(mi.SubImage(image.Rect(int(s.X), int(s.Y), int((s.X+s.W)*inverseZoom), int((s.Y+s.H)*inverseZoom))).(*ebiten.Image), op)
+
+	cs := m.game.Camera.GetState().(CameraState)
+	cp := m.game.Store.Players.FindCurrent()
+	x, y := m.game.Store.Map.GetHomeCoordinates(cp.LineID)
+	// Color TOP and Bottom
+	for i := x - 4; i <= x+(18*16)+3; i++ {
+		// We draw 3 lines so it's kind of **bold**
+		// and it's easier to see
+		screen.Set(int(i-cs.X), int(y-cs.Y-4), green)
+		screen.Set(int(i-cs.X), int(y-cs.Y-3), green)
+		screen.Set(int(i-cs.X), int(y-cs.Y-2), green)
+
+		screen.Set(int(i-cs.X), int((y+86*16)-cs.Y+3), green)
+		screen.Set(int(i-cs.X), int((y+86*16)-cs.Y+2), green)
+		screen.Set(int(i-cs.X), int((y+86*16)-cs.Y+1), green)
+	}
+
+	// Color Left and Right
+	for i := y - 1; i <= y+(86*16); i++ {
+		screen.Set(int(x-cs.X-4), int(i-cs.Y), green)
+		screen.Set(int(x-cs.X-3), int(i-cs.Y), green)
+		screen.Set(int(x-cs.X-2), int(i-cs.Y), green)
+
+		screen.Set(int((x+18*16)-cs.X+3), int(i-cs.Y), green)
+		screen.Set(int((x+18*16)-cs.X+2), int(i-cs.Y), green)
+		screen.Set(int((x+18*16)-cs.X+1), int(i-cs.Y), green)
+	}
 }
diff --git a/server/assets/wasm/maze-wars.wasm b/server/assets/wasm/maze-wars.wasm
index 19984f9..f72b98e 100755
Binary files a/server/assets/wasm/maze-wars.wasm and b/server/assets/wasm/maze-wars.wasm differ