first fixes of layouts