minor ui fixes for issues #1158 and #1210
Merge pull request #377 from kobotoolbox/ui-fixes

Ui fixes for #1158, #1182 and #1210