re-organize some links