Cleanup User Interface section