UI dialog fixes