Hover : rework UI
Halo : rework UI and cleanup