css shit
Fixed HUGE merge issues