Cleaning up layouts, updating footer