Added new fields and updated first page