moving styles to separate css
resolved conflics