Minor fixes to menu. Added index to menu items