Added custom fields in correct order, removing the ones that are not used in the active admin view