CMS-1845 Refactor DetailPanel