Fix bug of multiple modals
Add Country and Log to Motions