Minor bugs fixed and tweaks for forms