Updates to router for cleaner view handling.