Fix controller bug, fix Take Survey view

![](http://i.imgur.com/lLXiZE1.gif)