Fixed field matching and small changes to html

Fixed field matching and small changes to html