Adjusted nav position on grid
Merge branch 'ep/settings'