Adapting the list according the mockup from TEAM-134