Fix panel size
Add grid and fix panel size
Merge