added toolbar control
removed header control