Nav cleanup
Add offset to index