re-organize site option groups