Many updates for UI and internal classes.