Slider replaced with discrete button input
Fixed merge conflicts in camera.html