Changing some UI stuff, almost as I want it :D