Made a bunch of edits to the layouts to make them more consistent.  Tell
me if it sucks.