CSS and some other fixes