Added css to info
Resolved merge conflicts