Bugfix: Panel management