better form error handling and moved macro
fixed some validation wrt site validation