Fixing missing directives and fixing UI interactions