added router, new templates and views