Done user controller
Tidied up and simplified controllers