some refactoring and additional map functionality
Merge branch 'master' of https://github.com/bitstars/SimpleUi.git