Updated the HW UI, tested in isolation