Lots of improvements to collection index and show
Lots of improvements to collection show and index