Changes to style and router handling