Refactoring + set origin to top left again