Slider works
Clean code
Fix merge conflicts