removed duplication from buttons
fixed conflict