started the styling
resolved merge conflict for cookbook show