Merge pull request #14 from wschorn/button_appears

Button appears
Add grid system
two metrics, two buttons, all magic
more updates