Fixed some links and routes