fix arrange