- Bugfix GUI