Saving Profiles refactored not to looking so ugly