Fixed panel issues