Final fixes from Jamie's suggestions, mostly styling