Updated slider display
merge conflict