Huge menu redesign. Unfortunately now it doesn't even compile.