Made changes to onSave/RestoreInstanceState