Switch views to erb
Merge branch 'erb'