Design issues #3 : Fix links (organization)