fix some part of layout