Fixes panel not cleared bug

Minor fixes