Played with the layout some more