Revert "Revert "Review Page Loaders;""

This reverts commit 95870f37a0a9bed1ab8bbf1ca600153ce8d0dbea.