Updated views according to the new models