Clean css
Fix logo
Fix merge conflicts