Cleaned some UI