push for Vlad 7-17; To fix header and footer.