Update basic layout
Clean up a little
Add User Controller