timob-15951: fixed bugs in composite layout.