more css and fix merge conflicts