reworked menu to be more obvious

Issue #63
Merge pull request #66 from icrni/menu_rework

reworked menu to be more obvious
reworked map markers behavior
Merge pull request #67 from icrni/map_markers

reworked map markers behavior