Working on the index and nav