Merge branch 'dev'
Generic functions for saving and loading
Basic menu layout, missing functionality still