basic layout fixes
resolving merge conflict -- Survey controller
Merge pull request #10 from leejart/survey_homepage

Survey homepage