Simplify user interface
Merge branch 'master' into eav-db
Change pie chart scaling
Merge branch 'master' into eav-db