re #15 - Drawer : Fix minor BUGS & remove drag