Allow a custom controller be specified in a action
Fixing some translation issues