Big rework on controllers, account management almost complete with modal dialogs