adding form message and enhance functions