Source formatting
Merge branch 'pr-21'
Fix screenheight bug
Re-add screen size variables