Topic/fix static links