Fixed some of the views