- Rework UI code
- Minor hooks bug fixes
