marginally better layout, could use more work.