WIP enhancement on ui