UI more fixes