Refactor so we don't use details tags