removing back button, adding more restoreState