Update top links and some fixes