Modified page's view to be more consistent