Added NoRouter
props comments