LAC-83 ui bug fixing