Code cleanup, updated gitignore
Dialog modified