reworked the template views to include a more simplier generic views instead