minor changes + css optimization