In Photoshop CS6, how do I show the shape layers and such in this guide?

[Doju]

Guide: http://medialoot.com/blog/realistic-takeout-coffee-icon/

I believe the author is using Photoshop CS5, while I'm on CS6 beta right now.

At this part in a guide I'm following:

I don't see these options in CS6. How do I replicate them? This is my toolbar for the shape tool:

 

[UTclassof89]

The first option you've circled is the drop-down menu that says "Shape" in your CS6 screenshot.

The second is removed (select the desired shape from the Tool panel)

The third is the Path Arrangement drop-down (the icon to the left of the one that looks like a gear)