re-arranged the fields in settings dialog