The Web Client Modularity Application Block for .NET Framework 3.5 looks interesting. I'm going to look into this piece. I've had good results in the past with creating user controls for major pieces of functionality. The modularity makes changing the site or adding functionality simpler and the changes are isolated to individual controls. So this is definitely something that will be core to the design of the next version of the FlightLink site.
