Fix links and add spacing