HAL-64: Layout tweaks for role assignment