fixes of layout