Halo : Rework UI and cleanup