GPS math fix and calibrate enabled
Edit screen layout
Merge branch 'Alex-BM-Edits'