Add tooltip for primary button remove
Add a custom session driver