timob-13686: fix a layout issue + code clean up