Fix fade, allow secondary menu for right mode, change listener