Feature/account settings

pull request with out tests and notification pop-ups