Changed H5/H6 tags to Span for buttons/options
Included global variables to make consistent
Merge pull request #20 from zenduo/develop

Consistency updates and use of global vars