fixing the footer and some overall css tweaks
fixing conflicts