Merge branch 'release/1.0.0'
Fix minor layout problem with user filtering options
Merge branch 'hotfix/1.0.0a' into develop