Create Menu Strategy and refactored a few bits of code