Prettied up views and took advantage of the model relations