fixed CSS
fixing overwrites
fixing conflicts