Empty lines in various forms
I noticed a couple of empty lines in some forms, which are caused by using
addInput instead of
addGlobal to add hidden form inputs.
The linked PR fixes them, along with a small logic error introduced during Bootstrap conversion.