Updates from recent PRs.  Reverted user dropdown.  Sorry, Justin.