Made the layout more readable