Fixing issues in directives and ui part transformation