more tweak of the layout