Tweaked menu behaviour