BKJS-34 Correct flexbox issues