Don't redirect but re-render page.
General improvements on stability