Space slider improvements
Merge