Applied UI changes from 
Fix issues in deletable variables and relations
Can no preview variables