Refactor slide order