Tweaked the UI and added a few small things