Merge pull request #168 from fahadhatib/develop

More client side form checking