Small UI fixes
Merge branch 'master' into mjulian/ui-fixes
Merge pull request #53 from Zentyal/mjulian/ui-fixes

Small UI fixes