clear text fields with cancel / bugs fixed