adding css
more css
resolved merge issues