Fixed menu swap and launch bug