fix and relayout