Clean up creation of main screen views