Added enhancements to both public and admin views