Adding autosave and UI updates