Fix layout properly this time