Add header/footer, and more editing