Change top links, close #3