Dispose of silly namespacing, move edit bar to directive