Fixed 100% cpu busywait bug (how embarrassing)
Fixed a problem with the header menu with an obsolete method
being called.