navigation drawer refactor