Better classifying layout method
Merge branch 'hotfix'