Slight fixed to Gruntfile again, and some css organization