added toolbar and new switches