Ui changes

This PR will reconcile your branch and the current master; (this incudes adding autosave functionality).