Several fixes on UI
Merge branch 'master' of https://github.com/mydlp/mydlp-ui