add session and fix forms