Update to menu links

And general cleanup.