Upgrade to CM 3.0, organise scripts and css better