Refactor control lookup
Change to grey toolbar