Custom form validation & few tweaks