UX changes

Now, when the user select an item. This item remains highlighted.