Polished up menu. Mostly complete.