Redesigned pickup step2
Fix overlapping grid with panel control