fix animation
add btn style
remove redundant code