added UI and some original Map drawer fixes