added hide and show event for buttons
fixed merge conflicts