More slide refactoring