Hi fsendel, It looks a lot better now! Photoshop has some neat perspective tools as well that can help combat leaning buildings and architecture.

Photoshop Box Tutorials - Fix Perspective