Better positioning of popup windows
Merge branch 'develop' of https://github.com/fleetster/control-tower-clean into develop