Add prepare-run page and other updates