Refactor and changes in navigation drawer and action bar.