FIXUP - refactor to remove view logic - controller changes
FIXUP - refactor to remove view logic - view / i18n changes
FIXUP - refactor to remove view logic - feature changes