Bug fixes (save / load button)

Now working