HCSVLAB-292: Final UI ammends for Jared