Add css, improve transition