Fix new general layout

Fix new general layout