FAIMS-775 Fix UI issues