diff --git a/frontend/src/js/app.ts b/frontend/src/js/app.ts
index de11d43..bf35c27 100644
--- a/frontend/src/js/app.ts
+++ b/frontend/src/js/app.ts
@@ -63,10 +63,10 @@ store.actions.loadAll().then(() => {
 		'/template/:id/create': TemplateCreateEntity,
 		'/template/:id/edit/:eid': TemplateCreateEntity,
 		'/generator': GeneratorAll,
-		'/generator/:id': GeneratorSingle,
-		'/generator/:id/edit': GeneratorEdit,
 		'/generator/create': GeneratorCreate,
 		'/generator/create/:id': GeneratorCreate,
+		'/generator/:id': GeneratorSingle,
+		'/generator/:id/edit': GeneratorEdit,
 		'/data-source': DataSourceAll,
 		'/data-source/:id': DataSourceSingle,
 		'/workshop': WorkshopAll,
diff --git a/frontend/src/js/core/templating.ts b/frontend/src/js/core/templating.ts
index 808498c..4dee68b 100644
--- a/frontend/src/js/core/templating.ts
+++ b/frontend/src/js/core/templating.ts
@@ -88,6 +88,7 @@ const rngScript = (seed: any) => `
 		<script src="https://cdn.jsdelivr.net/npm/@dice-roller/rpg-dice-roller@5.2.1/lib/umd/bundle.min.js"></script>
 		<script>
 			window.random = new Math.seedrandom('${seed}');
+			Math.random = window.random;
 			
 			rpgDiceRoller.NumberGenerator.generator.engine = {
 			  next () {
@@ -203,7 +204,7 @@ export const render = (
 		};
 
 		let additional = '';
-		additional += rngScript(clonedState.config.seed ?? 'test-seed');
+		additional += rngScript(clonedState.config.seed ?? Math.ceil(Math.random() * 500000000));
 		additional += aiScript;
 
 		if (minimal) {
diff --git a/frontend/src/js/ui/components/editor/generator.ts b/frontend/src/js/ui/components/editor/generator.ts
index 244f01a..7270735 100644
--- a/frontend/src/js/ui/components/editor/generator.ts
+++ b/frontend/src/js/ui/components/editor/generator.ts
@@ -147,7 +147,7 @@ export default (): m.Component<GeneratorEditorProps> => {
 								centerContainer: true,
 								render: () =>
 									m(Editor, {
-										current: fillConfigValues(state.config, attrs.generator?.config ?? []),
+										current: state.config,
 										definition: [
 											{
 												key: 'seed',
@@ -159,7 +159,6 @@ export default (): m.Component<GeneratorEditorProps> => {
 											...(attrs.generator ? attrs.generator.config : []),
 										],
 										onChange: (updated) => {
-											console.log(updated);
 											state.config = updated;
 											m.redraw();
 										},