Finish updating spacing

Still a lot of style issues, but mostly getting there.