Add messages section, fix header