Links and menus

Some general fixes to links and menus