Add Forms and restore routes