Substantial Macaroni Au Gratin with Spinach