Home fix
add view test & fix
fix merge dev into 677
fix test
Fix haml
Merge pull request #65 from is-valid/677_Home_fix

677 home fix