REF-92 - Updates for admin screens and bug fixes

REF-92 - Updates for admin screens and bug fixes