Mostly functioning except edit and delete links
Couple minor edits
Merge pull request #25 from 27001/asd-workingBranch

Asd working branch