IMG-658 fix layouts