Fixing forms to behave better