change CSS and fix bugs