Account controller structure and tweeks