Reorder controls so they are added to map in correct order