Enhance layout