Fixed some issues with the views