Improve layout and routers