Made a lot of addtions to the views part