Fixed adding unecessary buttons