Menu switching fixed