Added user class
Finish layout and routes