Don't redirect but re-render page.
General improvements on stability
Added menu locations in overview template
Merge pull request #2 from HazCod/master

following upstream