more css and type
merge and pull