Fix issue #324 + more tweaks to make extension even closer to pre-Polymer

Fixes issue #324 as well as makes changes to make it look even more like pre-Polymer. Changes tested in Firefox and Chrome.