added sliders, refactored to tables