enhance the button
fix button and merge changes