A little progress toward a better layout and Gruntfile