Fix detail page links
Better spacing
Merge