Edited views and template

Edited views and template to handle new model! This branch is now
finished!