Add footer and clean up labeling