Added toolbar with file save support