Reorganized UI classes.