Dialog Design and comments added