First menu commit
Merge remote-tracking branch 'origin/master' into Context
Visualized
Functional
Merge remote-tracking branch 'origin/master' into Context
Rearrange settings screen for more space.
Close to being done
Merge branch 'Context'