Added the index Menu
Solved merge conflicts