Bug fix: multiple controls ui bug