Fixed the layout of the fields on the edit screen