Mode ids in good partials
Add two modals
Some reorganisation for less files