more tweaking this layout so it's not so cluttered