Re-doing the nav drawer (2)