Fix broken layout with Sprint 28 version