Lots of UI and security improvements
Merge remote-tracking branch 'origin/master'
Lots of UI and security improvements