Minior fixes in UI