Fixed bounds of slider to account for exception
Fixed merge conflicts