Made some major changes to get the menu looking decent. Totally non-granular commit.