LAI-1 UI clean-up