Changed the views and removed un-necessary stuff