fix fields and styles