Reorganized UI groups as part of iOS 7 UI work