reworked preferences and moved to account