I've had my camera for a few years but have only recently been in the position to start getting some new equipment so any advice would be much appreciated.
I have a Canon 400d with the 18-55mm kit lens (non IS) and I recently bought a Canon EF 100mm f/2.8 Macro USM lens as I like shooting macro.
However, I mostly shoot landscape, architecture and I have also started to become interested in night photography. I really want to upgrade my kit lens but I don't know what the best options are - so far I've looked at:
Canon EF-S 18-135 mm f/3.5-5.6 IS
Canon EF-S 17-85mm f/4.0-5.6 IS USM
Canon EF-S 15-85 mm f/3.5-5.6 IS USM Lens (possibly a little too pricey for me at the moment)
What can people recommend as a good upgrade to the kit lens and also some good suggestions for lenses in generally for landscape, architecture and night photography (I have a tripod)