Changed how view is loaded