Nav and grid remake