updated showcase styles
Merge remote-tracking branch 'origin/test'
resolved merge conflict