Fix View class
Fix Router class