Change screen size, code cleanup
Merge branch 'dev' of github.com:ejjarder/radar-beats into dev