did some css stuff
fixed merge