Updated UI - icons, view borders, etc.