Modified event-dispatcher model
Fixed redirection bug in standard template