Hopfully made the styles work
Fixed some conflicts