Fix old css
Fix layout