Fixes

- Modal Popup (code moved lower down)
- checkbox vertical misalignment (restructured)