Filter form adjustments to markup and css