Rework of the DetailActivity