Router annotation fixing, tabs cleanup