Reorganized UI setup