More nav drawer improvements