Slider functionality added, some cleanup