Major GUI enhancements + bugfixes