UX improvements, state save/restore mechanism, clean up