Unified layout with new KBC