tweak css and fix merge conflicts