Some changes in router, controller, viewer and other for a little