Some refactoring.
Started making menu