reorganize and add spacer footer