CSS fixes
Html structure