Added ability to change user name and cleaned up controllers