some css I forgot here
merged