Fixed UI errors
Merge branch 'master' of https://github.com/Meash/Highly-Secure-Systems