Further improved default layout.