Reorganized header layout and testing new menu