Fix new general layout

Fix new general layout
Merge pull request #86 from Bonbons/patch-34

Fix new general layout