Update the badge icons on cluster view, add exit button to cluster view