Update mfr Edit page to show mfr name

Other minor things like getting rid of comments, etc.