Label enhancements in CircularDrawer

Here are the updated Drawer commits.