Refactor/detail page