Restructured the code to make it easyer to create new view's
Before changing from sessions to decorator