Cleaned up code and default dialogs