Small ui fixes
Merge branch 'master' into ui-fixes
wip
Merge branch 'master' into ui-fixes
Changed wording and disabled workspace search tab
Merge pull request #422 from stefk/ui-fixes

Small UI fixes