Tidying structure and adjustments to footer