Some clean up and new footer