Fixes for menu.php