Refs #21 - Remove translations from component markup, tidy up some translations