Merge "Fix panel bugs"