Added some validation and tweaked forms