Add edit link
Merge
Move birds to /birds/ and add /infrastructure/
Merge