Fixes to main layout (simple).