Make menu more oop