Expand and reorder environment