Merge pull request #4 from johnkchow/master

Added spacing into grid
Add line-height hack for .f-button in the .f-decorator