Prep for details page - refactor a bit