UI fixes for account management and profile pages and refactoring of account model