Fixed some Grunt stuff, lots of UI updates, lots of it is a WIP.