tweaked some more on the layout