5010 redesign product form

Another case of "should I fix this?" And again, I've changed this file so much now that there's no point in still being reluctant to move this.