Removed dismiss workaround (fixed on watchapp)
Better class names