Index and detail pages layout refactoring