Ui changes

This PR will reconcile your branch and the current master; (this incudes adding autosave functionality).
(The history looks a bit messy, but there was a bit of work involved in not having git-merge break on me)