Fixing menu stuff