Revert d88d3b2..e1f2b15

This rolls back to commit d88d3b20e18a2f789af3f40b30a6cda69ff14194.
Revert "Revert d88d3b2..e1f2b15"

This reverts commit a23cae00688e25f399ba765bd5dfb8707f88b988.
Fix slider