- Fixed the bugs
- Changed dialog xml