Add buttons and have issues