Don't force overlay
Minor cleanups
Now with 100% more dynamic loading