Fix headers and menu category