FIXUP - use draper properly
FIXUP - typos in translation keys.