Refactor new session form