Slider refactor