Implemented clear save button/ options screen.  Updated files with TODO: notes