NavigationDrawerLayout enhancements, fixes #45 #48