code cleanup and updates to bottom/footer