Howard/navdrawer upgrade