Redirect to better page on force run check
Minor template tweaks