Add some cosmetic fixes

- Remove two instances of Router
- Make authentication only for secured page