Added some changes on the views