More nav drawer overhaul