Trying to fix some UI stuff