Tweak grid styles
Merge branch 'master' into ie8-support