Added separate control class for toolbar