Updated header and footer and borders