Changed placement of 2 fields