BS-9035
Fix layout