DB & UI Drawer code merged

DB & UI Drawer code merged