Maps improved, combo working, to be continued.
Merge branch 'development' of https://github.com/albertleal/OWApp into development