Reorganized UI controls