Cleaning up router and controller
Fixed a couple of back/forward bugs