Improve Gruntfile and CSS"