GUI pimp and bugfixes