Improve transition component