I changed the order of these hoping it would clean up some of the messed up closing tags but no luck. Let me know if it needs to be switched back to the original order.