Fix slider, misc organization