Clean up element styles
Refactored behavior dependent on Polymer-vs-non-Polymer