fleshed out layout a bit