Now handling usercontrols better.  Fixed xamlresolver.