EPD-229: Work on Safe Haven panel
checkstyle fix