fix links, still some layout problems but getting better