Fixed Menu stuff after failed merge.