- Refactored globals into general and domain-specific
- Added lock time to pick page