improve overall performance and add detail page