[BUG #8610] moved widgets up into ui namespace
[BUG #8560] minor