minor ui fixes: #1220, #1036, #1221
Merge pull request #381 from kobotoolbox/ui-fixes

Minor ui fixes: issues #1220, #1036, #1221