improves mix of compactness and trust
changes some layout aspects
Merge branch 'master' into alerts