Fix - Remove double-escaping on main menu items (includes method)