Some refactoring. Improved navigation drawer framework.