added account settings
cleaned scaffolding