Spacing changes. Added some color