Proxy js in progress
Changed form handling