Updated how master view is created.