Fixing the menu, switch cases, etc...