Make layout more tidy.