Added in fields
Added icons