fixed tables, added announcement tables