GUI Improvements + Bugfixes