Minor changes
Change Effect and Implement of Return Button