Changed PK for User_has_Mood and changed Prefs

Added more prefs and re-ordered Pref Ids