Merge pull request #10 from lrakhman/layout

Layout
fixed up a bit from that error
Merge branch 'master' into survey_controller
Merge pull request #11 from lrakhman/survey_controller

Survey controller
navbar
Merge branch 'master' into layout