added columns at lines 5 to 8 and at lines 11 to 13
Merge branch 'edit_footer'