Fix to gnarly CSS issues