Resolve merge conflict, add popup JS/CSS