fix merge errors
fix slider settings after resize
fix bug with widthslider -- revisit this later