tweaked layouts some more