refactored account to settings