Made some changes on the views