Cleanup and css optimisation