merging some UI fixes as well as the begining stagesof vulnerabilities
in the UI