Added user model and fixed page controllers