Fixing up the views to work w/ templates