New panel layout & some JS patch