Spacing Complete

Needs Review by product owner, but ready for pull request in regards to
but fixing not overhaul