Multiple fixes

Move key selector to template, more localization, html cleanup.