* TODO item about UI changes added