Additionnal fixes, however, the _popoverContentView is still out of control