Blank screen is now a screen of static grid squares.
Merge branches 'grid' and 'master'