Fix ordering of vertical bars in submenu
Improve link icon logic
Fix extra '|' character in submenu