bug fix
update popup btn functionality

not fully implemented