Added fields and styling