Fixes for anouncement edit and view
Fixes for anouncement edit and view