clean up ui, navigation and button colors
Merge branch 'develop', remote-tracking branch 'origin'