stop button validations and interal storage saving refactor