Some functions merged in Drawer.js