Fix Panel
Merge