Small fixes
Added validation to forms