Headers for check-in and read-only screens and UI improvements
Fix Merge