Simplify CSS and improve transition