Add sliders to form
Merge branches