Improvements to locking content when drawer is open