Added arrange button. Need to remove Add... button when arranging.