Added user system
Add user views and fix layout