Set up a better structure for layout and views