Added a UI clean up