Improve i-form margins a bit
Give plugins more control over asset injection