refactor(bs3): misc fixes & port death modal