fixed rightpanel overlapping leftpanel issue
Merge branch 'overlapfix'