grid system, buttons all on the same file.

Grid system, and some other features are getting tight on the container
file.
Some media queries about aspect ratio was added to future tests