Enhance assignments form and controller