Fixing ui stuff currently