New heading component and lots of resetComponent cleanup