Fix plus button to use button element and style it with span to allow
positioning of plus sign.