Content Changes and UI Improvement