Fixed final conflicts and re-instated footer BG