Remove "data-" prefix and minor touchups.
Merge pull request #254 from karma-exchange-org/ui-improv-10-31

Remove "data-" prefix and minor touchups.