Cleaned up announce view