Tidy up mobile commits
Finished up self designed saving