Various Bug Fixes

Removed Nav, Fixed bug in surveyview