Fixed some minor Bugs + Added new dialogs
Merge remote-tracking branch 'origin/master'