Added btw class to remove from event button
Make calendar and upcoming the same query