worked on link show page and others
merged conflicts