Layout fix [JOINDIN-357]