Refactored headline-lists and tabs