UI-3035: List View - Incorrect UI and function