Make layout more readable