Are there currently any workarounds or fixes for the editing of ASP (.aspx)
pages that contain customer user controls (.ascx)?

Viewing the site in Contribute is fine, but after clicking the edit button,
all user controls are replaced with yellow question mark images or ASP tags.

I guess we could redesign to use web controls only when ultimately necessary
(regular include files otherwise), but I'm hoping someone has found a nice
work-around or fix to this problem. It might also be that my setup is wrong,
but we're using normal ASPX pages and custom web controls for the header,
footer, menu and other common elements. Not all require actual code-behind
files, but some will...

Thanks in advance for any help/comments,
Keith