Attempt to clean up UI more.