added toolbar
wired up 2 directives