Bug 4838 - Librarian's Dream: links aren't in the correct order/use diff...

...erent selectors

http://bugs.dwscoalition.org/show_bug.cgi?id=4838
-- Reorder links
-- Use same selectors for links