Fix Bugs
Fix order of the links in the submenu.