Improve readability of button transition + fix bug