Added spacing, fixed gride rendering:
Merged conflicts; grid working