Layout fix for better merge