fixed menu and added tooltip fix