Fix footer and data saving