Modified css
resolving conflicts