Add and fix UX Building blocks
Fixes UX Building blocks stuff