Drawer and url fix