changes footer styles
fix merge issue