Lots of refactoring for pages
Don't use :require, add asset-types