Fixed reordering of components
Changed reorder to always active
Merge branch 'feature/reorder' into develop