Identify the widget id correctly when saving injections

Also restructured the field injection to a more VIP-preferrred structure
Merge pull request #28 from borkweb/6071-preference-saving

Identify the widget id correctly when saving injections