CSS cleanup and update demo code to the latest online version

Please check the individual patches for more info @markgoodyear :)