More UI updates
Merge branch 'master' of github.com:quinten991/PenO3OnTrack