Bit of tidying, and add css and js minification.