added more templates and CBV's