fixing size of footer only
fixing merge conflicts
footer size