Small changes
Solved dialogs memory leaks
Removed trash left behind