Ability to remove buttons + warning for empty + span fix