Added export toolbar
Fixed merge issues