more rearrangement of the view
Correct npm test again