disconnect account, refactor controllers, misc bug fixes