basket form fields adjusted after form overhaul