Multiple changes to header and layout