Fixed a few Bugs in the UI