Fix links and bootstrap