Feature re-arrange