reorganized UI