YH-460: fixing general layout problems