Added some UI tweaks and stuff