tweaked layouts so far so good