Rewrite on Map class
Null pointer exception fix
Buttons rename
Select on map template
Added select, changed icons
Removed unused code