Changing headers and fixing lists