Simplified UI, improved display