Cleaning up some UI issues.