More WebLaF integration work