Render variables in pages correctly
Fix handling of new pages