Tweak the layout some more