Setup Grid layout
Fix Merge Conflicts