Tighten up some spacing issues

Played with grid