AW-1871 #comment fix layout issues