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
Only attempt to set the image height using the attribute if there is one
Merge pull request #29 from borkweb/6105-image-fix

Only attempt to set the image height using the attribute if there is one
If ads should be suppressed, make sure we don't inject in small
Merge pull request #30 from borkweb/6185-suppress-ads-in-small-too

If ads should be suppressed, make sure we don't inject in small