Identify the widget id correctly when saving injections

Also restructured the field injection to a more VIP-preferrred structure

See: https://github.com/GigaOM/gigaom/issues/6071