xpath fix for menu, cleanup