Fixed bug from when implemented lazy update of invisible Headlines. Some code cleanup