Fix #20: Change indicator position when re-ordering