Work on map drawing, UI