Revert 1e3cef9..79400f6

This rolls back to commit 1e3cef98520644cb1e90ff3866b5b7bbba09623c.
Cleaned up some of the deck issues, added grid