added router, removed fadeIns