Continue to refine form and JS that acts on it