LAC-83 Ui bug fixing