Refine routers and fix project save bug