Cleaned up views and alerts