Migrating to a proper single page solution...