Make layout more consistent