Improve dynamic loading of panels