Use building blocks UI widgets, minor async issue