moving html to views to reduce class lenth
Merge branch 'feature/views' into develop