merge popup dialog & default popup

refactor
update manifest

refactor