Changed H5/H6 tags to Span for buttons/options