Major Grunt re-config and design updates