Added confirmation title. Some refactoring