Add service popup. Fix users popup.