Menu + Button fix