Add and remove buttons/functionality