Cleaned up some UI issues.