Getting much warmer with the layout