more fixes of layout