Fixed some conflicts but with really shitty css