Added slider and code clean-up