More improvements, add confirmation before group a window