Same little changes on dialog but keeping original java code format