Revamp of grid V2
Revamp dynamic layouts
Wording fixes
Grid revamp work