Further cleanup of UI