re-org some elements