Work on nav and grid