Refactor/detail page

No