some css things
fixed conflict