modified popover and merged cw buttons with bootstrap buttons