Added support for Grunt, messed around with the layout a little