Added Drawer support
Initial work on search functionality