Reorganized preferences dialog