BugFix: Dialog is not maximizable anymore
BugFix: Dialog closes correctly now
Update + code cleanup