Lots of adjustments to spacing and sizes.
lots of adjustments to spacing and sizes
merging changes with Jeff