Fixes to the drawer feature