Hi Dave,
I still think that smaller commits make it easier to handle git history, but here is a squashed patch. We've updated the styling as well. Shirley okayed this styling for now but is going to look into updating it in the future--investigating whether we should keep the checkboxes.
Also, as a heads up, I will be rolling off the project after this week. :(
Tira