Minor Improvements

Announcements - Mostly on Tenant Viewing. No Updating yet on admin part.
Working on it