Account settings

Improved functionality of account settings screen.