issues buttons, others
cleaning conflicts