ESSENTIALS-378: UI adjustments.
Merge branch 'master' of github.com:onehippo/essentials