Feature/4526 4354 header and footer