You must be staying at the Windham or the Sheraton, based on the view. I can see the TV tower in the distance. Last time I was there I stayed on the pedestrian mall at the Sofitel. Did you get the Rolexs on the Bund? That is where I got the 18 that I brought back last time.
Here is the post I made almost 2 years ago along with some of the pictures I took:
Hello to all from Shanghai China
I'll be going back, maybe, at the end of September.

Leave some cheap Rolexs for me!