Fixed a couple of issues with the save and view.