Fixes and edit link