Re-organize elements