Fix hardcoded form values and cleanup imports