Cleanup after last commit
Unify the code to retrieve current nav.drawer resources
Fixes #7