Update UI and fix files in publicview and clean up code for agreements.