Closes #622
Merge pull request #624 from onaio/622_view_by_visual_fixes

Closes #622