Separated more views from code