decorating custom dialog + fixing saving confirmation bugs