Refinements.
Merge branch 'master' of https://github.com/mydlp/mydlp
Merged with ui upstream.