fix/update shape for client and update notebook popup to work in both mode composited and not composited