Made the layout more layout-y