Add forms handling and conditional navigation rules