Merge pull request #17 from XhmikosR/master

Tweak grid system and a few minor changes