Added state to routes
Update templates