Minor refinements to Shiny widget.
Fixed merge conflict