Fix navigation drawer highlight and nitpicks