Adds buttons and clean up