Label -> name, remove image field which was overriding file
Give more descriptive classnames to fields