Attempt to fix up top spacing for site with/without slider/feature menu.
Fix merge conflict.