added my views, edit rx_alerts, etc
merge fix