Refactoring.

Menu and Index refactored.