Revert "Last pre-demo tweaks"

This reverts commit 5d565256db52003526bf9529a16c220bd4b5249d.
Merge branch 'master' of https://github.com/p4r4n01d/TableForEight