Minor indent cleanup
Fixes related to ajax form and popup
Minor fixes and type conversions