Layout refactoring, fixes statistic values
Authored by: Johannes Binder 2014-04-23
Parent(s): [49b554]
Child(ren): [4066d1]