reorganize settings fields