Main layout minor fixes.