Transfer remaining html to haml
Merge branch 'haml_trasfer' into dev