Refactored DetailActivity