Improvements

- Code Improvements
- Save without replace bug fixed
- Gui Improvements