Canvas
Update naming convention, reposition header/footer